Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 18:55:40 +0000 (11:55 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 18:55:40 +0000 (11:55 -0700)

Trivial merge